Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 6 Jul 2010 12:12:41 +0000 (12:12 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 6 Jul 2010 12:12:41 +0000 (12:12 +0000)

Trivial merge